bitkeeper revision 1.34 (3e4cfce1Ot4YJzJ4jwNjDthlFrZV5w)

conflict resolution.

diff --cc .rootkeys
index fbeff2f687a184a8770c461072756e205ed362ee,5ccc4be5befa934d53317a5ce95e3ef09e4992a7..f5028599726ad45ff29ff47c8b590652a8fc2f6d
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -73,14 -65,10 +73,12 @@@
  3ddb79bdYcxXT-2UEaDcG0Ic4MIK1g xen-2.4.16/drivers/ide/ide-pci.c
  3ddb79bdOXTbcImJo8DwmlNX88k78Q xen-2.4.16/drivers/ide/ide-probe.c
  3ddb79bdDWFwINnKn29RlFDwGJhjYg xen-2.4.16/drivers/ide/ide-taskfile.c
 +3e4a8d40XMqvT05EwZwJg1HMsFDUBA xen-2.4.16/drivers/ide/ide-xeno.c
  3ddb79bdkDY1bSOYkToP1Cc49VdBxg xen-2.4.16/drivers/ide/ide.c
  3ddb79bdPyAvT_WZTAFhaX0jp-yXSw xen-2.4.16/drivers/ide/ide_modes.h
- 3ddb79bfogeJNHTIepPjd8fy1TyoTw xen-2.4.16/drivers/net/3c509.c
 +3e4a8d401aSwOzCScQXR3lsmNlAwUQ xen-2.4.16/drivers/ide/piix.c
  3ddb79bfMlOcWUwjtg6oMYhGySHDDw xen-2.4.16/drivers/net/3c59x.c
  3ddb79bfl_DWxZQFKiJ2BXrSedV4lg xen-2.4.16/drivers/net/8139cp.c
- 3ddb79bfLVGtyXNJS4NQg-lP21rndA xen-2.4.16/drivers/net/8139too.c
  3ddb79c0tWiE8xIFHszxipeVCGKTSA xen-2.4.16/drivers/net/Makefile
  3ddb79bfU-H1Hms4BuJEPPydjXUEaQ xen-2.4.16/drivers/net/Space.c
  3e4540ccS4bfbx9rLiLElP0F1OVwZA xen-2.4.16/drivers/net/e1000/LICENSE
@@@ -440,10 -421,8 +439,11 @@@
  3ddb79ba2qYtIQAT_-vCFkkZUXu_UQ xenolinux-2.4.16-sparse/include/asm-xeno/user.h
  3ddb79bbqhb9X9qWOz5Bv4wOzrkITg xenolinux-2.4.16-sparse/include/asm-xeno/vga.h
  3ddb79bbA52x94o6uwDYsbzrH2hjzA xenolinux-2.4.16-sparse/include/asm-xeno/xor.h
 +3e4a8cb7ON8EclY3NN3YPXyMT941hA xenolinux-2.4.16-sparse/include/linux/blk.h
 +3e4a8cb7GJrKD0z7EF0VZOhdEa01Mw xenolinux-2.4.16-sparse/include/linux/major.h
+ 3e37c39fVCSGQENtY6g7muaq_THliw xenolinux-2.4.16-sparse/include/linux/skbuff.h
  3ddb79bb_7YG4U75ZmEic9YXWTW7Vw xenolinux-2.4.16-sparse/include/linux/sunrpc/debug.h
 +3e4a8cb7j05wwb1uPZgY16s68o7qAw xenolinux-2.4.16-sparse/init/main.c
  3ddb79bcxkVPfWlZ1PQKvDrfArzOVw xenolinux-2.4.16-sparse/kernel/panic.c
  3ddb79bbP31im-mx2NbfthSeqty1Dg xenolinux-2.4.16-sparse/mk
  3e15d52e0_j129JPvo7xfYGndVFpwQ xenolinux-2.4.16-sparse/mm/memory.c

diff --cc BitKeeper/etc/logging_ok
Simple merge

diff --cc xen-2.4.16/common/domain.c
Simple merge

diff --cc xen-2.4.16/common/event.c
index 4514d02eb3ef3a42068db335a71f6cc255c8c72a,3e7c416c29a7d6d01f16b8b7b2e2066707592cab..4cc2c70287efd8708eb3afd39a7691fd09cb4e34
--- 1/xen-2.4.16/common/event.c
--- 2/xen-2.4.16/common/event.c
+++ b/xen-2.4.16/common/event.c
@@@ -14,16 -14,14 +14,16 @@@
  typedef void (*hyp_event_callback_fn_t)(void);
  
  extern void schedule(void);
- extern void flush_rx_queue(void);
 +extern void flush_blk_queue(void);
+ extern void update_shared_ring(void);
  
  /* Ordering must match definitions of _HYP_EVENT_* in xeno/sched.h */
  static hyp_event_callback_fn_t event_call_fn[] = 
  {
      schedule,
-     flush_rx_queue,
+     update_shared_ring,
 -    kill_domain
 +    kill_domain, 
 +    flush_blk_queue
  };
  
  /* Handle outstanding events for the currently-executing domain. */

diff --cc xen-2.4.16/common/kernel.c
Simple merge

diff --cc xen-2.4.16/include/hypervisor-ifs/hypervisor-if.h
index 9a1be50b1598a3b2caaf7342765a5da4678990e9,2d6b84e83e0068441679417765d7f03a277da93e..cf3edb8cfb8862b71e89e78febdfc72b14e1e389
--- 1/xen-2.4.16/include/hypervisor-ifs/hypervisor-if.h
--- 2/xen-2.4.16/include/hypervisor-ifs/hypervisor-if.h
+++ b/xen-2.4.16/include/hypervisor-ifs/hypervisor-if.h
@@@ -107,15 -106,9 +107,10 @@@ typedef struc
  #define EVENT_BLK_RX   0x02 /* empty buffers for receive. */
  #define EVENT_TIMER    0x04 /* a timeout has been updated. */
  #define EVENT_DIE      0x08 /* OS is about to be killed. Clean up please! */
 -#define EVENT_NET_TX   0x10 /* packets for transmission. */
 -#define EVENT_NET_RX   0x20 /* empty buffers for receive. */
 +#define EVENT_DEBUG    0x10 /* request guest to dump debug info (gross!) */
 +#define EVENT_NET_TX   0x20 /* packets for transmission. */
 +#define EVENT_NET_RX   0x40 /* empty buffers for receive. */
  
- /* should these macros and the ones below test for range violation? */
- #define EVENT_NET_TX_FOR_VIF(x)    (EVENT_NET_TX << (2 * x))
- #define EVENT_NET_RX_FOR_VIF(x)    (EVENT_NET_RX << (2 * x))
- 
- 
  /* Bit offsets, as opposed to the above masks. */
  #define _EVENT_BLK_TX  0
  #define _EVENT_BLK_RX  1
@@@ -123,11 -116,7 +118,8 @@@
  #define _EVENT_DIE     3
  #define _EVENT_NET_TX  4
  #define _EVENT_NET_RX  5
 +#define _EVENT_DEBUG   6
  
- #define _EVENT_NET_TX_FOR_VIF(x)    (_EVENT_NET_TX + (2 * x))
- #define _EVENT_NET_RX_FOR_VIF(x)    (_EVENT_NET_RX + (2 * x))
- 
  
  /*
   * NB. We expect that this struct is smaller than a page.